Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 11:42:38 +0000 (11:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 11:42:38 +0000 (11:42 +0000)
commitd32245c7a981f7ab0169c1c845d12811322ff7fa
tree3f730d427d4299045e60c4de467e0433648e9c86
parentef4f809798185361f1d7303bcc7e81bbe0f6c780
parent2b786f51a7658353e00131e891f6cb8ff8a694d7
Merge from mainline.